Improve pre-round experience