Removed Some navi problems fixed content