Cleaning up notion of layers and plots. Added fig.geom.