Added popup fix
Final commit
Fixed headers