UI + cleanup