Refactor recycle dialog to remove table layout control