Controllers updated and added
Updated template and css
Fixed errors