Changed buttons, logic & some methods