Cosmetics and ARIA improvements