fix bug: editing entries doesn't work well
fix bug: popover not working