Cleaned up the views, added better checks for valid users/companies, fix...

...ed a few issues with routes