UserInterface/windows cleanup
Got rid of Singletons