Updated Freehand and Label classes to use new control bar