Small cleanup of new toolbar interface