re-arranging buttons
Merge branch 'pollish' into commitment_views