Edit menu aesthetics for Account Dialog, and more code clean-up