Made details better / not break delete and edit