Edit functionality, added popup