Refactor delete/confirm buttons to use a helper method to create...

Also ensure these button is not a type='submit' but a 'button' - so it doesn't conflict the any sorrounding forms