Feature/fixing crossfilter

@LilaHickey @pzwang @bryevdv this is waht we need to make the crossfilter look kind of decent with the new UI (before that, the toolbar was getting wrapped to the bottom)

will this work?