Added front end and some fixes to the controllers