Improve window format spacing