Minor fixes of UI, and crash in Service