Account for title bar height, improve wrap-around