Some of the formatting for the linear is not quite right yet.

But stil… it is tidies up a lot.