Refactoring - still a lot of tidying up of the admin area is required