Merge "Keep buttons from changing size when they change state"