Cleaned up the views, added better checks for valid users/companies, fixed a few issues with routes
Merge pull request #30 from liamneesonsarm/view_cleanup

Cleaned up the views, added better checks for valid users/companies, fix...
Merged from pickemup master