Updated app layout and welcome views 2.