Cleanup views

- use new Ruby syntax in views
- use includes in controllers to prevent excessive queries
- remove queries from view code as it make it much more messy