Fixed some display issues.
Resolve merge conflict.
Merge commit '4299556cfd8530a7d14655bf617577386db6b2d8' into docs