cleanup and order of panel