Fixes to UI, Delete function