Miscellaneous edits for formatting
Changes for error 404 case