Handle empty lists correctly
Simplify imports
Fixed unit tests
Removed reusable_form left overs