Improved styling of query building