responsive design
fixed conflicts