Improve window caption