make margin and movements finer
Merge branch 'master' into 2.5