new form and menu link refactors