Updated templates to look better