Tidying up with aluminum frame furnitures

Big thanks to Albino Marques and Jake Wilkinson