Fixed ugly popup