Added cursor classes
Tidy up