updated app layout and welcome view 2