View widgets refactoring