Improved the navigation containers