* Service and UI fixes