Finish like functionality and improve UI