Some fixes for bocce--main layout, no search term