Updated app layout and welcome views