fixed fluid and sidebar
Merge branch 'develop'