Refactoring, removed edit button.