Refactor views a little bit, still primitive

Some refactoring and cleanup of views. Still basic as hell.