Fix highlighting of login button
Highlight badge on hover
Fix merge conflict
Merge pull request #680 from pafcu/master

Some hlighlighting on hover