Correct highlighting on board
Cleaned up highlighting & js