updated basic layout