diff --git a/extensions/apidoc/apidoc b/extensions/apidoc/apidoc
index 706dd1b171..0dd7d372e8 100755
--- a/extensions/apidoc/apidoc
+++ b/extensions/apidoc/apidoc
@@ -11,43 +11,44 @@
 defined('YII_DEBUG') or define('YII_DEBUG', false);
 
 $composerAutoload = [
-	__DIR__ . '/vendor/autoload.php', // standalone with "composer install" run
-	__DIR__ . '/../../autoload.php', // script is installed as a composer binary
+    __DIR__ . '/vendor/autoload.php', // standalone with "composer install" run
+    __DIR__ . '/../../autoload.php', // script is installed as a composer binary
+    __DIR__ . '/../../../../autoload.php', // script is run from yii2-dev/extensions
 ];
 $vendorPath = null;
 foreach ($composerAutoload as $autoload) {
-	if (file_exists($autoload)) {
-		require($autoload);
-		$vendorPath = dirname($autoload);
-		break;
-	}
+    if (file_exists($autoload)) {
+        require($autoload);
+        $vendorPath = dirname($autoload);
+        break;
+    }
 }
 $yiiDirs = [
-	__DIR__ . '/../../framework', // in yii2-dev repo
-	__DIR__ . '/vendor/yiisoft/yii2', // standalone with "composer install" run
-	__DIR__ . '/../../yiisoft/yii2', // script is installed as a composer binary
+    __DIR__ . '/../../framework', // in yii2-dev repo
+    __DIR__ . '/vendor/yiisoft/yii2', // standalone with "composer install" run
+    __DIR__ . '/../../yiisoft/yii2', // script is installed as a composer binary
 ];
 foreach ($yiiDirs as $dir) {
-	if (file_exists($dir . '/Yii.php')) {
-		require($dir . '/Yii.php');
-		break;
-	}
+    if (file_exists($dir . '/Yii.php')) {
+        require($dir . '/Yii.php');
+        break;
+    }
 }
 if (!class_exists('Yii')) {
-	echo PHP_EOL . "The Yii Framework 2.0 does not seem to be installed. Try running composer install." . PHP_EOL . PHP_EOL;
-	exit(1);
+    echo PHP_EOL . "The Yii Framework 2.0 does not seem to be installed. Try running composer install." . PHP_EOL . PHP_EOL;
+    exit(1);
 }
 
 Yii::setAlias('@yii/apidoc', __DIR__);
 
 $application = new yii\console\Application([
-	'id' => 'yii2-apidoc',
-	'basePath' => __DIR__,
-	'enableCoreCommands' => false,
-	'controllerNamespace' => 'yii\\apidoc\\commands',
+    'id'                  => 'yii2-apidoc',
+    'basePath'            => __DIR__,
+    'enableCoreCommands'  => false,
+    'controllerNamespace' => 'yii\\apidoc\\commands',
 ]);
 if ($vendorPath !== null) {
-	$application->setVendorPath($vendorPath);
+    $application->setVendorPath($vendorPath);
 }
 $exitCode = $application->run();
 exit($exitCode);
diff --git a/extensions/apidoc/templates/bootstrap/layouts/api.php b/extensions/apidoc/templates/bootstrap/layouts/api.php
index 7cc38b182d..b76d4ab069 100644
--- a/extensions/apidoc/templates/bootstrap/layouts/api.php
+++ b/extensions/apidoc/templates/bootstrap/layouts/api.php
@@ -15,7 +15,7 @@ $renderer = $this->context;
 $this->beginContent('@yii/apidoc/templates/bootstrap/layouts/main.php'); ?>
 
 <div class="row">
-    <div class="col-md-2">
+    <div class="col-md-3">
         <?php
         $types = $renderer->getNavTypes(isset($type) ? $type : null, $types);
         ksort($types);