refactor services, ui refresh