Media Queries cleaned up