Feature/fix form ui

closes #25