Fix positioning of navbar rightside

Change-Id: Ie25ece473485a7d2a46590872f4fb476b4a51699