Added all styles and changes to pages
Fixed cconflicts