Added stock toolbar support.