Added delete class
Fixed delete class
UI bug fixes