Changed tab labels to be more user-friendly and messed around with the metric nav buttons
Don't version the schema merge conflict files, please