First refactor and cleanups

Removing the second view and cleaning up some functionality. Also now counting hits.