Updated Inputs and Markup