mediaqueries and zindex
fixed things
merge fix