Added Bootstrap tooltip and several bug fixes