refactored entry forms in order to make some room for the update one