Added popup page and homepage