cleanup code
fix width of labels