Add Fields and Buttons