Add homepage and fix popup