Updates to generic pages and css
Resolving a conflict