A bit more refactoring.

Some name changes to best practices, switch to using url templatetag to simplify code, simplify some view methods