Challenge mode + ui corrected