updated app layout and welcome view 3