More button fixes