Added popup and cleaned up site