Fix WindowState/WindowStates XML reading
Restore columns for OptionsForm
Fix comment