Fixed so button label parent is the button itself
Made improvements to the input field interface