Fixed deletion requiring two click due to a late grid update
Formatting changes