Tweaked estimator form design and refactored controller to accomodate changes