Refactoring panels