Cleanup of view so that it uses html helper functions