Modifing to look nicer and small updates for each controller and view.