More progress on the home page
Fixed users controller
Fixed merge conflicts