Fixed up the plot a bit, including some problems on the cida domain

Also, working on the reservoir styling a bit.