basic refractor of recently added calculation stuff and show events page