Some refactorings. Design cleanup and refinements. Added additional file input to the notice#new form.