changing the arrangements
Merge branch 'master' into fixmodalstyles
merging