Made progress on basic layout