Cleaned up 2P screen