couple of fixes and enhancements for the layout and when to generate the cron