diff --git a/doc/source/index.rst b/doc/source/index.rst
index a00530730b..476d21232b 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -26,6 +26,7 @@ User guide
 
    userdoc/installation.guide
    userdoc/configuration.guide
+   userdoc/dashboard.guide
    userdoc/advanced.configuration.guide
    userdoc/upgrade.guide
 
@@ -49,6 +50,7 @@ User guide
    userdoc/hdp_plugin
    userdoc/spark_plugin
    userdoc/cdh_plugin
+   userdoc/mapr_plugin
 
 **Elastic Data Processing**
 
@@ -72,7 +74,7 @@ User guide
    userdoc/guest-requirements
    userdoc/hadoop-swift
    userdoc/diskimagebuilder
-
+   userdoc/cdh_imagebuilder
 
 Developer Guide
 ---------------
diff --git a/doc/source/userdoc/cdh_imagebuilder.rst b/doc/source/userdoc/cdh_imagebuilder.rst
index ad300adbc5..30e9db3ac1 100644
--- a/doc/source/userdoc/cdh_imagebuilder.rst
+++ b/doc/source/userdoc/cdh_imagebuilder.rst
@@ -1,7 +1,7 @@
-.. _diskimage-builder-label:
+.. _cdh_diskimage-builder-label:
 
 Building Images for Cloudera Plugin
-==================================
+===================================
 
 In this document you will find instructions on how to build Ubuntu and CentOS
 images with Cloudera Express versions 5.2.0.
diff --git a/doc/source/userdoc/cdh_plugin.rst b/doc/source/userdoc/cdh_plugin.rst
index 2194aebe7b..421c88a7c2 100644
--- a/doc/source/userdoc/cdh_plugin.rst
+++ b/doc/source/userdoc/cdh_plugin.rst
@@ -1,5 +1,5 @@
 Cloudera Plugin
-==============
+===============
 
 The cloudera plugin is a Sahara plugin which allows the user to deploy and
 operate a cluster with Cloudera Manager.
diff --git a/doc/source/userdoc/features.rst b/doc/source/userdoc/features.rst
index 583012c690..be770ee02b 100644
--- a/doc/source/userdoc/features.rst
+++ b/doc/source/userdoc/features.rst
@@ -205,6 +205,7 @@ Currently HDFS HA is only supported with the HDP 2.0.6 plugin. The feature is en
 a cluster_configs parameter in the cluster's JSON:
 
 .. sourcecode:: cfg
+
         "cluster_configs": {
                 "HDFSHA": {
                         "hdfs.nnha": true
diff --git a/doc/source/userdoc/guest-requirements.rst b/doc/source/userdoc/guest-requirements.rst
index e434ecb490..85b2aaef39 100644
--- a/doc/source/userdoc/guest-requirements.rst
+++ b/doc/source/userdoc/guest-requirements.rst
@@ -39,7 +39,7 @@ This plugin does not have any additional requirements.  Currently, only the Cent
 To speed up provisioning, the HDP packages can be pre-installed on the image used. The packages' versions depend on the HDP version being used.
 
 Cloudera Plugin Requirements
----------------------------
+----------------------------
 
 If the Cloudera Plugin is used for cluster deployment the guest is required to have
 
diff --git a/doc/source/userdoc/hdp_plugin.rst b/doc/source/userdoc/hdp_plugin.rst
index ea0f5435e4..6b07ee1c39 100644
--- a/doc/source/userdoc/hdp_plugin.rst
+++ b/doc/source/userdoc/hdp_plugin.rst
@@ -93,6 +93,7 @@ command line client (python-saharaclient) or Sahara REST API by simply adding th
 following cluster_configs parameter in the cluster's JSON :
 
 .. sourcecode:: cfg
+
         "cluster_configs": {
                 "HDFSHA": {
                         "hdfs.nnha": true