FIN-16:Changes to the htmls to make it look more proper and some of the controller changes