Cleanup rework and error handling.
No more accordion. Other minor UI tweaks.