changing UI and fixed service logic