More Jade-ification and cleanup

Dunno if these will make it to production, but they will be a little cleaner if they do. They all look reasonable on localhost:8080  ~d