splitted templates, added design tweaks