Adding in controls and other fixes for integrating WFS scanner and portal