Cleanup
Implement templating
CSS tweaks
Start group template