Updated app layout and welcome view