Refactored tube presenter and view so that it is no ready to be used wit...

...h the greater system