Improve interaction between builder and raw views
Fix reset
Add remaining views