Move misindented classes and methods to main tables, highlight with red and added proper title