Improve UI + cleanup