Views refactored and splitted into forms