Improve window layout, updated screenshot