[WIP] redesign
[WIP] new template version looks nice