Remove user finished & UI improvement