Cleaned up the button highlighting.
Merge branch 'source'
Compiled.