improved query, buttons, landing page