7.x 1.x panels

refactoring