Implemented the label view and other small improvements