added base_title
Resolving finishing layout and routes
Now merging
Fixing merge issues