Some minor code cleanups and app UX tweaks