Partial 4.1.2 Click Save

Almost finished.
Neaten up table a bit