tweak layout
Merge remote branch 'origin/develop'
Fix deprecated call