Improved routing
Updated the dependencies
Some minor improvements
Merge branch 'master' into topics/clean_forms