Commented out rollover highlighting, improvements