43 fix top nav using flat-ui

Trello card: https://trello.com/c/XgHiGqi5/43-fix-top-nav