move stuff
New markup for panel