Updated: Edit client to sort/edit/add/remove metrics as well. Removed: Seperate Add Metric button