changed tooltip point views to be added in order to the tooltip and cleaned up some code