FIXED: use included template behavior and not the core one
FIXED: little CSS tweaks