Changed label and button arguments, renamed namespace to fields