Improve window controls