Added toolbar controls