More redos for previous features and a bugfix for a dialog prompt appearing when cancel is selected on the notice form when it was not supposed to.