Refactored ArrangementForm

Fixed #157,