Use Hiccup's CSS syntax
Clean-up template