Cleanup time
Adding some views
Updating config, views, other stuff