Updated Layout and formatting