Minor fixes.
Add comment and continue with the work.
Imrpoved delete button.