updated layout and welcome view