Refactor subplot: move common plot modifications to the end
subplot: add plotting of custom lines