Fixes and improvements, added tooltips and animations