Added auto-disablin buttons
Did somer merging