Some fixes on settings UI