Refactored Windows UI to fit to refactored lib