cleaned up a little bit; measurement bars in place