close #154 view refactorings