rearranged labels
added trash icon
use service name instead of exports var
optimized module structure