reworked ui, consolidated services