Buttons are now highlighted

The changes are crazy and I will only explain if needed.  Lol