Update app layout and welcome viwes