Feature/cleaning record form upgrade

Closes #106