Refactor notification breakpoints, causes error, move into form partials.