Updated Layout and Controllers