Fixed class structure. Adjust title ali