Kwargs now passed to template and more oocss