Cleanup.
Fix for centering.
Merge branch 'develop'