Comment From Add new place and Radio buttons
Merge remote-tracking branch 'origin/master' into Tony
No more flicker on Not popped
No more flicker on notPopped