Added Configuration Edit Panel

+ some code refactoring