Clean controllers
Add propositions features