Updated templates, edited styles
Style/Random Changes