Updated Layout and Welcome views