Standardising building URLs in views
Cleaning up some coding style