fixed popup window
fixed initialize page
Merge pull request #86 from chorus-frogs-2014/alec_final

Alec final