Updated Layout and Strings