Function to add padding to factor labels
Add padding, source colors; clean up todos