Minor Fixes
Media Query
solved conflicts