functionalities are ready. Clean up the controller and make the UI nicer.