UI Changes & WebSocket changes