Removed all styles and some template updates