Fixed glaring UI oversight and did some other minor tweaks