Tweaked navigation order and display inline