Refactor lists, tooltips and nealy all other