fix AddAssignment button to show allways + fix crash after restore
Extract restore and save method into Helperclass and make them static