Rename some shit and make the labels work a little better.
Remove some padding and min widths and shit.
Merge branch 'master' into test_graphs