Convert new design to Jade syntax

Tidied up a bit while at it. Note that the JS logic still needs to be
written etc.