Add support for max wait time challenges and some restyling