Cleaned up the layouts a bit. (Dan, your layout has some issues, I
band-aided them, but for some reason it thinks the timer is the whos
guessing string and vice-versa)