Imrpove UX and resolve problmeatic merge