look and feel, labels and controllers fix