Improve rendering of activities