Fixed round search, minor UI