Cleans up a deprecation warning along with a few other UX tweaks