Fixed some abstraction in ServerManager and updated addEventDisplay to
be the proper merge result