done re-writting the UI logic with new controllers and new queryService.
UI look still need to be enhanced in the html and css.