continued ui implementation and adjusted queries