22a Updated app layout and welcome views