Added + button, delete functions, more