Reordered parameters in view routes.
Cleaned up after rebase in Gruntfile and style.styl