UI refactoring - html views