Bug fix and UI changes
Before replacing Delete function