design fixes for data query page
merge with query design tweaks