Bit of code refactoring and bug with multiple loader now fixedg
Merge branch 'Route_view' into develop