Markup changes, refactor post render
Signed-off-by: Spencer Deinum <spencerdeinum@gmail.com>