Reverting two commits

This reverts commit 2eba87b0a18a5d16704f7dd82ec59838a6873a20.
Revert "Top bar design changes."

This reverts commit 4179a9a2c685e580cc16ae38b97046ec7d530209.