CSS working for PC website and changing logo to new one
Fixing merging conflict