Overlay panel refactoring