Added a cleaning button and fixed an issue with the edit and highlights