Added toolbar functionality