#67 Refactor server displays