small refactor + improved events layout