Improve window layout