Fixed issues with Media Queries

Almost have it complete for mobile