Updated basic layout to handle needs for the app