index & popup fixes