Added selection, deleting
Minor theming