Move Builtins out of Handlers
Preliminary support for display framework