Updated layout and welcome views