Fixing models & controllers

![selfie-0](http://i.imgur.com/OSroad6.png)