Cleaned up animation and tooltips