Added autoToolbar support.