fixes and navigation patterns