Cleaned things up a bit

I wasn't able to follow Randall's suggestions since that broke many things for some reason. I am opening an issue for Control Bar V2, which will include better icons, etc.