#903 tweak button layouts