more button fixes