Updatd app layout and welcome views