Tweaks to get ui buttons working.