Added OtherUser and NotificationDisplay classes again and did some small cleanup