Fix Button Conditionals