Updated templates
Updated CSS for structure and design