UI fixed for Windows #2
UI fixed for Windows #3