WIP on panels routing with some refactoring
more refactor