Major refactor of plotting for multilayer