refs #204 - Streamlined the input form