Refactor presenter, add category views