MADS: Merged the InterfaceSurface and UserInterface classes