Controllers and views
Controllers and views changes
Big update. It works now.