Added code improvements, added tool tip texts