Updated templates and added styles