Improved templates, added maven slave box