Design improvement on events index