Service UI fix + Resource UI fix