More button size fixes