Added toolbar items and images, plus minor bug fixes.