Clean Up Service UI

In this PR:
 - Service module UI brought up to app standards