Angularify menu
Fix up some form items