Removed lattice classes and put the display methods into the original classes