Refactor some of the code to increase quality and fix admin check when displaying images and services available.