Update timeline for fluid layout and remove DataManager as a dependency to SocketService.