UI refactoring + product update refactoring