project and panel refactoring