Fixed and added routes
Merged new views