Settings templates/page structure
Updated header icons to be more button-y