Fixed empty state bugs, added user error module, improved form