Fixed TOC issue and floats issue