fixed media queries and some design bugs