Fixing (Barebones 2) navigation patterns