more name refactoring; single item ui logic