Updated templates and styles