Reworked jbake output