UI fixed for Windows #4