Updated app loyout and welcome views