Improved float-box styles, other cleanups