Fixed expander thumb display issues