margin -> padding to avoid jump when sliding
Merge branch 'devel'