refactoring UI window
refactoring UI window
added more tests