More code reorganization & Added tooltips on mouse hover