Fixed most input fields and add-ons