Fixes for the challenge UI