updated app layout and welcome view