Now with nice tables.

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
Refactoring of constant form code

Signed-off-by: Sam Phippen <samphippen@googlemail.com>