WIP: Styling new template