Major reorganization
Added a panel wrapper