Fixed window drawing issue, included app store (inprogress)