tidy up code in admin header, 404 page for default theme