refactoring

Refactored current front-end progress + tweaked corresponding back-end
services