Fix toolbar highlighting bug.
Merge pull request #45 from R2-Team2/bugFix-68-top-panel

Fix toolbar highlighting bug.