Move smaller labels inside bar, clean up