Mainly control panel related changes. Additionally some refactoring and renaming of labels in the view was made.