Changes for UI, Querying and Results display