Miscellaneous minor updates
Update layout template
Update user_pages_spec test syntax error