optimisations, and added services page