Cleanup.
Clean up rendering mess.
Refactor for attributes.
Use @$ form for query selectors.
Cleanup.
Cleanup.