Second fix for sidebar glitch and page artifact
Merge pull request #1579 from maximerassi/master

Second fix for sidebar glitch and page artifact