Fix Issue #35, seperated css by media query