Add feature notification
Merge remote-tracking branch 'origin/improve-nav'