refactored some parts + fixed an issue in tooltips