fixed bug in popup display, and toggle edit mode when user saves
updated snapshots for combo