updated layout and welcome views