Show current window in status bar
Fix crash when tidying windows
Merge branch 'master' into otr