Add show button and move links into form for simpler view