Pull request for numeric textbox, checkbox display etc