Refactoring some panel names and organization