Handle showing/hiding of inputs better