Markup cleanups on staff form