Cleaned up OOP Dependancies on Demo Window and Main Window.