code reorganization + a right panel