fix partial right navigation and make it available on layout