Move some HTML around
Add Item step

Improves some other flow-related issues around as well.