Updated templates and grid css