MADE THE STUPID TRY AGAIN SCREEN WORK

Try again screen now shows the correct answer in timetrials.  We can
talk tommorrow about making it work in EE as well.  Also made some
cosmetic changes to menus and stuff.
fixed merge conflict
fixed conflict