Various patches to the top-bar sass file.

Remove "fix" that causes dropdown menu items to not have the active
background colour applied.

Add back two lines that when removed, completely break the top bar.