Added toolbar base class