Updated Styles and added Templates