Added Delete Button and UI changes