PLA-1305 view refactoring