Fixed wrong dependency reference in Batch package.  Cosmetic changes to Layout etc.