Improve magnet dialog

Please see commit messages for what I changed.