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

Feature rewrite
cleanup