Fix delete bugs and improve UI