Fixes to hardcoded fruitsalad templates and styles