WIP: refactor for fixed panels