Fixed popup bug and fading forms