updated app layout & welcome views