grid refactoring & officer panel development