Fix db Structure  and Fix GameCompletePopup