some layout adjustments
updated version
fixed solr query
fixed solr query
fixed solr query