ui, grunt refactoring