Added criteria bar / Changed some classes cause grid was freaking out