Updates to services. Added settings page