Updated Layout and spelling