Service leak fix, UI improvements