Minor button fixes