Again fix button editing