Updated and expanded layout using master pages and themes