add toolbar support