Windows are now modal. Some minor ui changes

Closes #377