Clean up toolbar code a bit
Clean up toolbar code a bit

garyrh/bookreader,gootdude/bookreader,brisandbeans/bookreader,brisandbeans/bookreader,openlibrary/bookreader,internetarchive/bookreader,yankl/bookreader,openlibrary/bookreader,yankl/bookreader,niksu/bookreader,niksu/bookreader,gootdude/bookreader,niksu/bookreader,openlibrary/bookreader,niksu/bookreader,gootdude/bookreader,garyrh/bookreader,brisandbeans/bookreader,Islandora/internet_archive_bookreader,internetarchive/bookreader,openlibrary/bookreader,Islandora/internet_archive_bookreader,openlibrary/bookreader,garyrh/bookreader,Islandora/internet_archive_bookreader,brisandbeans/bookreader,nikolas/bookreader,nikolas/bookreader,yankl/bookreader,garyrh/bookreader,yankl/bookreader,niksu/bookreader,gootdude/bookreader,Islandora/internet_archive_bookreader,yankl/bookreader,brisandbeans/bookreader,Islandora/internet_archive_bookreader,garyrh/bookreader