markup overhaul with form and input fields