Simplify layout jade
Lots of work on the form + other stuff