Major fixing of navigation controller/bar