Moved css position
Merge branch 'dev' into v2.0