Update Theme Layout

Also update the sandbox theme layout to remove unused menu links.