improved final riddle and upgraded some UI