fixes bug 997426 - picture left from before if skipping
better designed edit entry modal