additional button fixes