Merge pull request #80 from gusaus/7.x-1.x-panels

7.x 1.x panels
cleanup