Clean up UI
Added delete function.