Refactored ModelView
Fixed submission logic in ModelView