Fixes and Refactor

Add delete button for textboxes and some refactor