Added toolbar support for dev mode