Merged the timer with the popthingy
Fixed basic popup views to both the timer and correct/wrong answer