fixed data syntax bug &  more buttons for fields