fixed css and better querying