Refactor, add visual elements for move/delete and add delete functionality