more wip, views integration and entries_controller refactoring