Small UI glitch and settings check fixes