Mostly CSS changes
Deletions
Merging branches