Admin portal tidy-up