A lot of Routing modifications.
Cleaning views