Refactored large parts of table view and event cell