corrected rightSideContainer

no scrollbars!
Merge branch 'master' into dev2