New navigation style. Fix #8