Changed Controller class and added few minor fixes in UI design