Merge pull request #1305 from KostyaSha/fix2

Fix documentation.
New general layout using <div>s