fixed button column
better
Merge branch 'origin/plot' into develop