Fixing the buttons. Simplified that damn code.