refactoring, refining. TODO: get the item to display properly.