improved layout reuse and test markdown and html hibrid